Added support of timestamp/date/time using curly brackets #1894

matthewryanwells · 2023-07-21T21:50:26Z

Description

Added support for using timestamp/date/time using curly brackets in the following ways to fix failing date filters in PowerBI:

Definition	Type
{ts 'YYYY-MM-DD hh:mm:ss[.SSS]'}	Timestamp
{timestamp 'YYYY-MM-DD hh:mm:ss[.SSS]'}	Timestamp
{d 'YYYY-MM-DD'}	Date
{date 'YYYY-MM-DD'}	Date
{t 'hh:mm:ss[.SSS]'}	Time
{time 'hh:mm:ss[.SSS]'}	Time

Issues Resolved

#364

Check List

New functionality includes testing.
- All tests pass, including unit test, integration test and doctest
New functionality has been documented.
- New functionality has javadoc added
- New functionality has user manual doc added
Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java

codecov · 2023-07-21T22:16:18Z

Codecov Report

Merging #1894 (25a8c01) into main (c8d42a7) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1894   +/-   ##
=========================================
  Coverage     97.39%   97.39%           
  Complexity     4603     4603           
=========================================
  Files           401      401           
  Lines         11397    11397           
  Branches        835      835           
=========================================
  Hits          11100    11100           
  Misses          290      290           
  Partials          7        7

Flag	Coverage Δ
sql-engine	`97.39% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

GumpacG

Please fix jacoco failures

* added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com>

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

matthewryanwells · 2023-07-26T16:05:26Z

Please fix jacoco failures

I have rebased my PR so now everything (Except for BWC) works now

opensearch-trigger-bot · 2023-07-26T16:29:01Z

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1894-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1a7134b79044de655445f2c1e24ec56467544f50
# Push it to GitHub
git push --set-upstream origin backport/backport-1894-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1894-to-2.x.

…-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> (cherry picked from commit 1a7134b)

…ensearch-project#1894)" This reverts commit 1a7134b.

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Added support of timestamp/date/time using curly brackets (opensearch-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> Bump bwc version (opensearch-project#1876) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Prometheus Query Exemplars (opensearch-project#1782) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Adding google code changes for core/src/main/java/org/opensearch/sql/analysis core/src/main/java/org/opensearch/sql/ast core/src/main/java/org/opensearch/sql/data core/src/main/java/org/opensearch/sql/datasource Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Disable checkstyle fore core module and enable spotless check for the files being checked. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added back core checkstyle test in sql-test-workflow.yml Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Revert "Prometheus Query Exemplars (opensearch-project#1782)" This reverts commit 430d7a9. Revert "Bump bwc version (opensearch-project#1876)" This reverts commit 501392e. Revert "Added support of timestamp/date/time using curly brackets (opensearch-project#1894)" This reverts commit 1a7134b. Revert "Statically init `typeActionMap` in `OpenSearchExprValueFactory`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7. Revert "Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)" This reverts commit 7b932a7.

…-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> (cherry picked from commit 1a7134b)

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Added support of timestamp/date/time using curly brackets (opensearch-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> Bump bwc version (opensearch-project#1876) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Prometheus Query Exemplars (opensearch-project#1782) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Adding google code changes for core/src/main/java/org/opensearch/sql/analysis core/src/main/java/org/opensearch/sql/ast core/src/main/java/org/opensearch/sql/data core/src/main/java/org/opensearch/sql/datasource Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Disable checkstyle fore core module and enable spotless check for the files being checked. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added back core checkstyle test in sql-test-workflow.yml Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Revert "Prometheus Query Exemplars (opensearch-project#1782)" This reverts commit 430d7a9. Revert "Bump bwc version (opensearch-project#1876)" This reverts commit 501392e. Revert "Added support of timestamp/date/time using curly brackets (opensearch-project#1894)" This reverts commit 1a7134b. Revert "Statically init `typeActionMap` in `OpenSearchExprValueFactory`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7. Revert "Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)" This reverts commit 7b932a7. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

…ets (#1908) * Added support of timestamp/date/time using curly brackets (#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> (cherry picked from commit 1a7134b) * fixed bad cherrypick merge conflict Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com>

…-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

… (opensearch-project#1897) Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Added support of timestamp/date/time using curly brackets (opensearch-project#1894) * Added support of timestamp/date/time using curly brackets (#297) * added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com> * improved failing tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * simplified tests for checking for failure Signed-off-by: Matthew Wells <matthew.wells@improving.com> * fixed redundant tests and improved tests that should fail Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com> Bump bwc version (opensearch-project#1876) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Prometheus Query Exemplars (opensearch-project#1782) Signed-off-by: Vamsi Manohar <reddyvam@amazon.com> Adding google code changes for core/src/main/java/org/opensearch/sql/analysis core/src/main/java/org/opensearch/sql/ast core/src/main/java/org/opensearch/sql/data core/src/main/java/org/opensearch/sql/datasource Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Disable checkstyle fore core module and enable spotless check for the files being checked. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added back core checkstyle test in sql-test-workflow.yml Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Revert "Prometheus Query Exemplars (opensearch-project#1782)" This reverts commit 430d7a9. Revert "Bump bwc version (opensearch-project#1876)" This reverts commit 501392e. Revert "Added support of timestamp/date/time using curly brackets (opensearch-project#1894)" This reverts commit 1a7134b. Revert "Statically init `typeActionMap` in `OpenSearchExprValueFactory`. (#310) (opensearch-project#1897)" This reverts commit c8d42a7. Revert "Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (opensearch-project#1899)" This reverts commit 7b932a7. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

matthewryanwells requested review from pjfitzgibbons, ps48, kavithacm, derek-ho, joshuali925, dai-chen, YANG-DB, rupal-bq, mengweieric, vamsi-amazon, Swiddis, penghuo, seankao-az, MaxKsyunz, Yury-Fridlyand, anirudha, forestmvey, acarbonetto and GumpacG as code owners July 21, 2023 21:50

GumpacG previously approved these changes Jul 21, 2023

View reviewed changes

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java Outdated Show resolved Hide resolved

matthewryanwells dismissed GumpacG’s stale review via 3ba8b5e July 21, 2023 22:25

Yury-Fridlyand previously approved these changes Jul 21, 2023

View reviewed changes

Yury-Fridlyand added the backport 2.x label Jul 21, 2023

Yury-Fridlyand linked an issue Jul 21, 2023 that may be closed by this pull request

[BUG] OpenSearch does not support timestamp format {ts 'YYYY-MM-DD hh:mm:ss'} #364

Closed

GumpacG previously approved these changes Jul 24, 2023

View reviewed changes

matthewryanwells dismissed stale reviews from GumpacG and Yury-Fridlyand via b05d1b4 July 24, 2023 21:54

Yury-Fridlyand approved these changes Jul 25, 2023

View reviewed changes

GumpacG approved these changes Jul 25, 2023

View reviewed changes

GumpacG requested changes Jul 25, 2023

View reviewed changes

matthewryanwells added 4 commits July 26, 2023 08:29

Added support of timestamp/date/time using curly brackets (#297)

3704dc4

* added bracketed time/date/timestamp input, tests, and documentation Signed-off-by: Matthew Wells <matthew.wells@improving.com>

improved failing tests

3a11f9d

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

simplified tests for checking for failure

a71a881

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

fixed redundant tests and improved tests that should fail

25a8c01

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

matthewryanwells force-pushed the integ-bracketed-timestamp branch from b05d1b4 to 25a8c01 Compare July 26, 2023 15:29

GumpacG approved these changes Jul 26, 2023

View reviewed changes

acarbonetto approved these changes Jul 26, 2023

View reviewed changes

acarbonetto merged commit 1a7134b into opensearch-project:main Jul 26, 2023
21 of 25 checks passed

Yury-Fridlyand deleted the integ-bracketed-timestamp branch July 26, 2023 16:40

matthewryanwells mentioned this pull request Jul 27, 2023

[Backport 2.x] Added support of timestamp/date/time using curly brackets #1908

Merged

MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jul 27, 2023

Revert "Added support of timestamp/date/time using curly brackets (op…

b2d4872

…ensearch-project#1894)" This reverts commit 1a7134b.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support of timestamp/date/time using curly brackets #1894

Added support of timestamp/date/time using curly brackets #1894

matthewryanwells commented Jul 21, 2023

codecov bot commented Jul 21, 2023 •

edited

Loading

GumpacG left a comment

matthewryanwells commented Jul 26, 2023

opensearch-trigger-bot bot commented Jul 26, 2023

Added support of timestamp/date/time using curly brackets #1894

Added support of timestamp/date/time using curly brackets #1894

Conversation

matthewryanwells commented Jul 21, 2023

Description

Issues Resolved

Check List

codecov bot commented Jul 21, 2023 • edited Loading

Codecov Report

GumpacG left a comment

Choose a reason for hiding this comment

matthewryanwells commented Jul 26, 2023

opensearch-trigger-bot bot commented Jul 26, 2023

codecov bot commented Jul 21, 2023 •

edited

Loading